Revert "(GX) Experiment to see if menu triggering can still work through this"

This reverts commit b490e2208093cb033cfb551cac655f04fbeedc53.