Fixed latest merge disaster.