Revert cleanup change.