You're right, I'll create a pull request reverting that and I'll check if the same helps in `1.x-master`.