Backed out changeset ab1d9c6b581a (bug 919638) for build bustage