Backout d078b71b7015, 0134540d3d48, Adding the context menus back r=wesj a=lsblakk