Revert "Apply changes to N4071 in preparation for post-Rapperswil mailing"
Merge pull request #20 from cplusplus/revert-17-master

Revert "Apply changes to N4071 in preparation for post-Rapperswil mailin...