Completed this to-do in the previous commit