Revert for fixing bug