Backed out changeset e2d5b2be4142 (bug 994971) for non-unified bustage.
CLOSED TREE