Revert: https://jira.surfconext.nl/jira/browse/CDK-138 (b2292bb)