Backed out changesets f6402ce2b67a and 5bdec1cb1428 (bug 915705) because it depends on bug 882145, which was also backed out.