As noted above, I don't think we need duplicated code to handle this case.