I've reverted the pull request as it caused failing tests, i'm investigating those