Revert "Merge branch 'master' into dylan1"

This reverts commit 9a44fa108e482df3c758a22c11085af8636477ae, reversing
changes made to 8d40e8ae78211d7afebdae54f96f3ccfdd10dc5e.