Revert "Simplify some more"

This reverts commit dc0c302a955d20a0cb26596cb414409d8f0e522c.