This reverts commit 35ecb89a. Reason for revert: <Long make duration (infinite loop)> Change-Id: I10d1cf53ca3054d40e23b06368ebaff6af69beab