Backed out changesets 2f1fe3baec7c and 8beafe5ccc65 (bug 861920) because they depend on bug 861894, which was also backed out.
DONTBUILD