Revert part of #2512, shot in the dark that it will fix integration test...

...s