Creates infinite loop: b/18674776. This reverts commit 015b137e. Change-Id: I67fe310d2e95ee2ec37bec842be06fb1123b6f4e