Backed out changeset df8423fdcad8 (bug 888088) for possible premaorange crash