And that broke everything, somehow.

This reverts commit 81d8df2b6166c86113ce53d7d323a8805147be3e.