Actually do what I meant to do in the last commit