Revert submission

Reason for revert: Incomplete fix that causes additional issues which were not anticipated earlier.

Change-Id: Iff36d5a10e6c8ee8978a5842af8f19efc10c0a91
2 files changed