Revert "Merge branch 'master' into marty"

This reverts commit 4751bc83298b2b56c0027dc900fde56a9531ec01, reversing
changes made to 2bbfadfed155a6b67ff3ceb32dbcb27e4249bb56.