Revert "conf_call_fix"

This reverts commit beed62c9293b10b20802123d278ec63e5ab03683.