Motivated by #38215 and per https://groups.google.com/g/sage-support/c/Msx0QJF7rpA/m/NwSu9PMlAQAJ @videlec - Depends on #35856