Done in #3235