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

This reverts commit f32f7bec2f9213c93e866ffade8abc644f2be7c0.