Forward-port of r66447.
4 files changed