Revert unrelated changes.