KRACOEUS-8614: reverting sprint 12
Merge pull request #1365 from leoherbie/KRACOEUS-8614

KRACOEUS-8614: reverting sprint 12