Revert "Merge branch 'refactor-python-scripts' into 'master'"

This reverts merge request !1200