4.2 reverting HHH-8945

This still needs a JIRA & co, TBD