Backed out changeset 2d7dcf4f98b8 (bug 1022812) for build bustage.