Revert "Re-merging "Merge pull request #93 from jparadis/add-stoppropagation-ui-menu""

This reverts commit 61f77177986d8bf75581f50bbe463d52a054b2c2.

This change requires SFDC changes, reverting until those are ready to
check in.
Merging origin/tbliss/master-pending-revert-pr93 into master