Done in #1762