This addrsses GitLab issue #225: Python test failure. The bug I was originally targeting here needs further analysis.