Revert "WIP: undo this → only a temp change!  (if you see this on github, yell at me!)"

This reverts commit 143bc49515194297c7fc69ab14648c11dcfb4a0a.