Remove the hacky support for Context Menu's. It's not difficult to do it manually.