086d4b638c
This reverts commit 01bef804de2d65f9ce4cda80e937a718c7ee7628. This was missing an option, and also our password doesn't work. Change-Id: I317c29034efaae62ea74a5c16ec25bed98c1e3cc