HHH-9866 seems to have been broken somehow and needs to be re-fixed.