Re-apply r112883: