2cc8fa41 was incomplete and broke things, fix that.