Revert "Merge branch 'master' into Dylan-(replace"

This reverts commit f392520440d78172174adf87e4b6a2c95b45f837, reversing
changes made to c063e301a8d832a1d3d1f8d09a4b9031276f9c60.