Revert "Clean bits not yet merged into master."

This reverts commit c83394d46987f1041516676a2892baeed0882e65.
Merge pull request #25 from gnubila-france/add_back_registration_option

Revert "Clean bits not yet merged into master."