Backed out changeset 58209cc0ae14 (bug 833521) for build bustage.