Remove dummy DOM elements
They are not needed for the 4.0 design implementation.
Merge pull request #711 from kabel/bugfix-703

Remove dummy DOM elements

Removing them seems like a better solution than changing them to `<span>`s.