Revert "Revert "recursion fixes for origin_dt""

This reverts commit 063d75aa5d089bcaded50f6afeb90d16186b69e9.