Re-apply r83871.
3 files changed