Revert "Revert "Oracle-to-NonOracle""

This reverts commit e4e774dcba1c8dc8f8de8912ed27bd4e393fff4d.