Revert "Merge pull request #2634 from Steell/selection-fix"

This reverts commit b281b45ee1b3e7b2e1954b8308c9648ef204e2d2, reversing
changes made to d9e826f3a5da2cd85bdc321d7a25a39a68dc46ad.