Revert to old OrRule delegation.

I plan to continue pursuing the Python bug independently.