Fixing duplicate code which had gotten introduced because of a merge.