This is fixed as part of the changes in [0afa2bde0647bd77].