Same disease as with the previous fix.
This is an experiment towards how we want client-side titlebars to look.