This is fixed as part of #7661.