b=973782 revert 8e574d7a951a, failing test from bug 938022 DONTBUILD