Revert "Added first changes to support updating recipients without recreating them."
This feature needs more time and another way of solving it.

This reverts commit db42bfe0903dc8c7a187ab84795c5f3954e47c9f.