Reverts commit r1277
fixes #904
refs #641
This had been working for me in testing for some time, but received
issue #904 saying it broke the context menu. I was able to make it do
so on a new project as well. Will revert and comment in #641 about this.