These changes are wrong. You need to revert back to the current code