Rollback to 1.6 callback