Yes. That was causing issues, that's why it was reverted. If you want to provide a fix send us a Pull Request and I'll investigate it.