Comment 6 for bug 1737812

I have a simple commit to remove the dead menu option mentioned by Elaine, as I agree that this was the intention of this simplification plan.

Also, moving discussion to an omnibus bug for this omnibus branch...

Please see bug #1773417.