Fix for bad merge commit.