Follow-up r90877: spot the copy-and-pasted code... :D