Nice, so this would resolve #5137 too!  (Once we make run() use this, that is)