Good catch! I re-opened #7579 .

cc @BerndSchwarzenbacher