restore rolled back changes that happened at same time as arc support introduction