As a requirement for #1645
As a requirement for #1645