Revert part of 1a076d8d, workaround for WA page no longer needed.