Revert "Merge branch 'master' into marty"

This reverts commit 3055aae631ae74bf9ba03828c9f36c112669a5c9, reversing
changes made to 65d7b4c88dc53dcf5cfc687fe94764ea6fc89e2c.