Revert ce0e1c9..5fa65f4

This rolls back to commit ce0e1c9dcc1df85017893bbf447615acf21a3ccb.
Checkpoint before I go nuts on changing the menus