Fixing a *** that was brought in by the merge.