Revert "Revert e34870bf3, return to upstream ora2"

This reverts commit aa2879be75db2cf1691c731ba45f3254fed869cc.