Revert "Merge branch 'efcp' of git@github.com:kvetak/RINA.git into efcp"

This reverts commit 24b65b47d28899b2ff5fcd4af36e8379eaeeb42a, reversing
changes made to 8a49a1cc5220475bef70d7e23e458ae1bed3fb1e.