Revert patch for #1706039, as it can crash the interpreter.
3 files changed