Revert "Fight..."

This reverts commit 8035af34415015e6e27d76e61bb6a2ad31ce127b.