HH-39242 return old code for backwards compatibility