Pre 2.2 checkin