This reverts commit bc0f246911a35324473f72b770cc5715902cc912.

This was added as a workaround for a bug that has since been fixed.