Revert topic menu hack -- it broke a lot of things