Done in #1591.