Redoing changes that got lost in yesterday's merge.