Revert "Added auto_join field along with registry upgrade step"

This reverts commit f17b684a290a1c89c980d50b20a660b5783260c0.