This reverts commit 1a11965f. Reason for revert: fix Change-Id: I53be99ff7cfe9493ade7db625aaf54328f307518