Revert "Adding debugging and naive fix for issue 15334203"

This reverts commit ed11c14003ca4ae5f702b6eb3f6b5dd8f4e7d4a4.

Change-Id: Ifc46769477e590512cc5ab79a69063c0341f52b2
2 files changed