Corrected accidental merge of invalid changes.