This reverts commit 8424d4f6. That approach doesn't work. I checked in something that kinda works 30 min ago or so.