revert over-cleaning
Revert "revert over-cleaning"

This reverts commit acce998d8445ea35e98dca2e5991e68c926876d9.
revert over-cleaning