Restore original behavior when C2 is used Reviewed-by: thartmann, mdoerr, dnsimon, gdub
Reviewed-by: vlivanov
Reviewed-by: darcy, ihse