Use modified common repo again