Backout 187487847908, 890695773e56, Adding context menus back r=wesj, a=lsblakk