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

This reverts commit d5a9ed70936d7b207b78b8e957ccd19eabe334aa.