Revert "Merge remote-tracking branch 'origin'"

This reverts commit 53632e22ff43fc5e1ffb9d28ae9f1be7fb092fdf, reversing
changes made to 6a1e9697fe72e74750fb92f58a75c96819d5f71a.