Backed out changeset 2b16cefa20c9 (bug 873888) for bustage.
DONTBUILD