Revert dcbda65..ad39038

This rolls back to commit dcbda65ad3b39a55eb0c65aa0acbbf25246cb75c.
menu changes