This reverts commit baa76292. I think I might have broken some things with this commit so I'm reverting it so I can test further.