I didn't intend to commit this to main and it's kind of a work in progress anyway. This reverts commit 0da3340f0d.
0da3340f0d