Backout c41ceb365f00, 626abc356c25, and b756cab77bac (bug 839838) for non-unified build bustage on a CLOSED TREE