Merge r81445 from 1.17: revert r70520 (js password complexity checker)