Backed out changeset a0a40196da87 (bug 973096) for non-unified build failures