Whooops, this shouldn't have made it over from master.  Nuke it.