Backed out changeset 57d7e38549d4 (bug 1066785) DONTBUILD