Backed out changeset 03e5a89726be (bug 1110608) for non-unified build failure on CLOSED TREE
Backed out changeset cdf7d7507577 (bug 1110608) for non-unified build failure on CLOSED TREE