Backed out changeset d353d79e0610 (bug 1051633) for non-unified build failures