Revert utility class changes