CleanUp Manual revert...

I give up.