topbar: Remove now redundant work around