This reverts commit bd9dace4. Reason for revert: There is a bug with this commit. Change-Id: I95d40e5d35c1b810aec751fc0d0dfbaa7b87d345