Revert "Kill optional_call"

This reverts commit 5f6b67f9c9e73be2722cb907f29e0034be5150a0.