[cleanup] followup to f86b9d2884

@jmarshallnz for review. jenkins build this please.
Have you checked the callers to this?  If so, all good.