The fix is correct.  It was a typo on my behalf in e28aed30bbfc0da6972a50a8a8d42c41c9468253

@davilla: this one NEEDS to be backported to Frodo.