Revert "Merge remote-tracking branch 'origin/master' into 626-make-friendly-example-scripts-for-the-release"

This reverts commit 47f13b6b, reversing
changes made to e73560e6.