I'm reversing this change, as it seems the error is somewhere else.