Backed out changeset f3c4d03ad677 (bug 922924) for bustage.