Revert "Register working"

This reverts commit d9ddf1828f60170a412bb023ae95453cdd9f7ac5.
Revert "Revert "Register working""

This reverts commit 44756f968c16b3605ffa8b6c595526b74ff5a3f3.