Fix for last commit.

I messed up and didn't fully fix a merge conflict :T