I'm in favor of removing that hacky retrial too.