6efed4bee8
This reverts commit 7a3db26212.
Updating this requires fixing Sage tests, which will be done in a
separate PR.