Restoring the popover hacks that still need some attention