Revert "deal with STV on initial map too"

This reverts commit cd163d576f4e587544616d0d9ac7c7c71afa0815.