Revert "Automap accuracy fixes"

This reverts commit 12ecb4550e46ffdc28248be185738a88be033afd.