Revert-options-Shuffle-menu-around.patch
Revert-options-Inline-menu.patch
