revert a75f9d2 as integration tests are failing