In python 3.9, usage of this throws a warning and with DEVELOPER_MODE=1, that warning is fatal.

Check if this can be fixed without too much effort and while staying compatible with py35+.