Revert 80aa5b8df5fb1ba5355b2b9c75bd5dc3989b02d7, broke the execution of a couple of tests.