Backed out changesets 73f3ce609c23 and 990a21978a2d (bug 951431) because they were not intended for uplift. a=backout