fix a merge mistake by yours truly.