Revert "Merge remote-tracking branch 'origin/master' into private"

This reverts commit 4349ab285dde02db3c7be58babef362763d85de4, reversing
changes made to deebe8565453ffba6241eef86c07e94804fd38cc.