I’ve just made another PR that re-instates the existing approach and moves the new approach to a setting. Once @simon merges
2.4.0, things will return to normal on this front. There will be additional changes, however, as before, they should go unnoticed.
*edit now merged and pushed as