This reverts commit f659d05b. Reason for revert: adding the change again Change-Id: I481a3185690028dd9109e5618a8ad875104d3e4f