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

Please see #360 for details.