Merge damage
Revert "Merge damage"

This reverts commit a08b234170ebc330cc74095a97d42bd232839f00.