Revert "This will probably make ES tests a lot happier."

This reverts commit 4d7e5adc04c349b65ca71f6521a5becbc27cfad1.