Revert "Auto-register"

This reverts commit a936828303b7bad7b5b44ea7008da067ef099247.