Revert last commit for now

I'm reverting this pending further discussion on whether forcerenames
should be broadcasted.