[popover] put the old code back