Oh good catch. That's an old commit I'd made (and should have cherry-picked to incoming). I'll edit that commit to use the pattern we discussed that didn't involve making that change in runner.py