Some changes for downgrading to 1.6