Unused since d334f46b7a080fd3eb720141c19b37b10704a352. Backport of 4e016d137236d36d47462f63e8f7988f1ad6c12e from master