Rewrite to be more similar to Java execution to determine source of
retry issue