This reverts commit 09951208a78c9933159c68c6f8105eda40e8bd7e, reversing
changes made to 93a818d0186dce098cae4ae08dd368c23b895a4b.

I noticed an issue where context menus were appearing in the wrong
location (shifted to the right) as a result of this change.

Release Notes:

- N/A