Revert "Final changes before review for post-Rapperswil mailing"

Reverts cplusplus/parallelism-ts#18

Reverting the last couple changes to roll back to N4701.