Were we actually doing this twice? That's ugly.