Revert r66856, due to the complete rubbish commit summary (dupe of another revision)