Workaround for downgrading from 5.5 to 5.3