Repairable building by upgrade

A piece for adding DeploysToUpgrade and hopefully fixing WithMakeAnimation.
Requires #6750.