Put back code I accidentally deleted -- wrong branch.