Backout changeset a54f620cf84c (bug 843445) for build failures