Revert "Merge branch 'contextmenu'"

This reverts commit 52cbbcb662e3975f0f7e5538295432f2436ee4d6, reversing
changes made to e49ccc487cc7e481a98a0eff28eddc50a7d50d7f.