Comment 2 for bug 1231220

Updated the title of the bug to specifically call out the entities that I think need to be addressed.