This reverts commit 3a8130c7. Reason for revert: Build failed. Change-Id: I28c72c8c3adaeb23bff9bffe3994971aa3f2e4f4