clean was botched when i cherry-picked for the merge.

Sorry @galitskyd