435084cf0d
This reverts commit 4d1fe6b854.
Reason for revert: issue started occurring again
Change-Id: I5a5500c42209afc6b54f7dff60a821093d45294a