Revert "fix autoregistration"

This reverts commit 393cf1cc03032c5938bcc57d54659b6aeb415aa3.