This reverts commit 70b1203110. With the post-upload cleanup this change is no longer required. Change-Id: Id84ceab916f7225be0864a7bb60f96d5e3eda815 Depends-On: Ic0424638b9ddbf77e10cfe936d0b96ff2da1a59e
70b1203110