reverting 0ad fix due to unintended side effects