As mentioned in 981210, I'm just going to handle this on the gaia side until that bug is fixed (which will be after the upcoming code freeze). I've added comments in the menu and panel along the lines of "fix this after 981210 lands".