Backed out changeset 52218c11ec89 (bug 887819) for reftest failures.
DONTBUILD