Reverts commit 14773a6 to parse.py - Undoes some cyclic import safeguards