Revert "Fix Bug #5710 and make machine account password changing work again."