This reverts commit 3b584b78. Reason for revert: missing --mode. Change-Id: I0cde94c38905e26c79c31a03fd0177d7d57daa32