Cut out that python-charade codepath.
Merge branch 'hotfix/no-more-charade'