Determine which mode was selected more intelligently.

LMS-1384
Merge pull request #1577 from edx/diana/clean-up-choose

Determine which mode was selected more intelligently.