Unsurprisingly the munging around with the menu bar implementation details has resulted in things breaking, but fortunately the problem it was working around (#1314) appears to have been fixed entirely. Closes #1628.