Revert "OPLA: improved performance with variable management (avoiding copy for most of the cases)"

This reverts commit 28548db57d472da31fc575ed1f63be034a2b031f.