Fixed as part of #8751.