Revert "Improve the behavior of selection area expansion."

This reverts commit 6089ccfb1bacb9fe11fe70daef7f2d4d792be51f.