Backed out changesets b08e57dbef4e and 1049cfbf3426 (bug 947044) for various regressions.