Revert "Reverted to before I screwed things up"

This reverts commit 99c1eedcbfab6865685b1d7ec20f420fbb627e67.