[REG] Revert PR 2573

See https://issues.dlang.org/show_bug.cgi?id=13621