After a bit of investigation, and looking at the traceback, this has regressed in 5252c8dbec08ca5c6887cd2132d8937452646557
After a bit of investigation, and looking at the traceback, this has regressed in 5252c8dbec08ca5 c6887cd2132d893 7452646557