This was already done in 19.1.