Fix bad merge conflict from Ryan's previous PR