Oops, this shouldn't be here!  Failed to fix this in the merge.