Moving work on BLD-465 from PR 1811.
Fixing missing import in Python.