Revert "Revert "Revert "Oracle-to-NonOracle"""

This reverts commit bcf2dfb1196678b77a71c4a35a02c5992ed136cc.