Removed an optimization that seems to cause problems