Revert "Merge branch 'master' into update-readme"

This reverts commit e9ebebdd5669b9bc46c3f66142088b9bc6be8941.