This reverts commit 46e925e655.
Reason for revert: This was meant to be reverted when
a proper fix is possible.
The command in question was not used properly which
is the cause of the original issue.
This change fixes the actual bug of not passing the
admin password properly.
Change-Id: I6d9e1f11135c6664b1fb864e326fd5dc4757db94