This reverts commit 50e73370. Reason for revert: ag/10112811 is better and more reliable fix Change-Id: Ice0c0e7a033013b01156898cd58df14b999e700f