Message 159773 - Python tracker

As of a40f47cc7691, Richard's idea is now the implementation, which seems to work well and has simplified the changes quite well. Attached is code_changes.diff which shows all of the necessary code changes as of now.

The test_import failure you were originally seeing has gone away (it was on default as well, I guess it has been fixed). test_email fails on the default branch as well so nothing new there.