Backed out changeset 6cb70cc44e8c (bug 927711) for build failure/bustage
Backed out changeset f27a2aba0db2 (bug 927711) for build failure/bustage