2.0 popovers not respecting custom classes

Created by: ansman

Since all classes are removed using className custom classes gets overwritten.