Corrected a commit merging mistake in the previous commit.