Remove duplicate code introduced in be6490d by mistake

Lesson: If you realized duplicate code, extracted it into a new function,
and forgot to replace the original duplicate code with a call to the new
function, you merely duplicated code once more.