Revert WA changes