Revert buggy changes