This reverts commit 7db68be5e1. Reason for revert: postsubmit build encountered a failure Change-Id: I3c7304114f712d78f79afb1b9d84dc2eadcbc876
7db68be5e1