Part of reverting most of r63675 per the mailing list discussion.
Attach a file by drag & drop or click to upload
