Drop -amended

Change-Id: Ie74d997a701d7597e733ac5525def9854d9c1120