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

This reverts commit c23f7f2b7dfb383a3787a9c86f4b10f5c255b895.