Revert "Experimental fix for battle links"

This reverts commit 89c34244c6a44bc6435e369cdcda7221b6a5997f.