Revert "replaced or with origin in the renderer"

This reverts commit 14791b61eaf62b4274560e9e89d7957d1929a64f.