This reverts commit 8d024a79. I accidentally included some "in progress" work that wasn't supposed to go with this commit.