Revert a minor change from cleanup