I removed that piece of code and will commit this if tests pass.