Restore popover plugin to master state

Accidentally merged too much from development branch.