Revert "Better Autorefing"

This reverts commit 4324cca2c49c6bb7613a1e2132ba61e2a1963865.
Autorefs