Backed out changesets aee6b1a6c400 and a633e4d67d31 (bug 875277) for bustage.