Partially reverts #5850, as this feature is a serious usability regression when controlling units. Fixes #6867.