Revert monad optimization for now.