Revert "registration 2"

This reverts commit 6f9110d94f1ac8ffcb7e740a3fbe58160babdb32, reversing
changes made to 0a7e9b86ce166474e9908bae750e8c69d798382f.
Revert "Revert "registration 2""

This reverts commit aa2c16dab23eccc16092823d9aa0545386c3cde6.
Revert "registration 2"

This reverts commit 6f9110d94f1ac8ffcb7e740a3fbe58160babdb32, reversing
changes made to 0a7e9b86ce166474e9908bae750e8c69d798382f.