This reverts commit 3e21fb616d9a1b29bf9d1a1ba484add633d6d5b3. A lot of integration tests are failing on the bot.