Switch build back to OASIS