Windows: revert some part from old controls dialog;
Merge pull request #1336 from CrazyMax/master

Windows: revert some part from old controls dialog