This is resolved by the changes in [af2c6346c92d5d04].