This reverts commit b2002d63. Reason for revert: missing --mode. Change-Id: I9177e4f5be396290a855d72677b3e991dcbc58c8