Revert "minor"

This reverts commit 7cf636f958b22be288527daf8756a5037192f538.
Popovers (refactored)