BUG-1493: activate recursion elision

Previous patch prepared the infrastructure for elision, but it did not
actually activate it. This patch flips the switch on.

Change-Id: Ic02af3ccc7f5ee5f8ae4d0617562b8fdffc771c6
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "BUG-1493: activate recursion elision"