System Core Revert

Revert to Orca 1 default