Out of scope for this PR. Tracking down everything that depends on that is a job for another day.