Revert "Merge branch 'master' into Keith"

This reverts commit 77919ed534ebda5ee930f90179f7d943b5146af1, reversing
changes made to 625978a8200ecbacdb03d3b811b1c70eef1da884.