WICKET-5366: rewrap bundle-HeaderItems after resolving
WICKET-5366: remove interface that was only introduced for backwards compatibility