Fix inefficiency introduced on 2007-11-03.