Revert submission

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

Change-Id: I383273509797ed95a7f9ece780ec52abb1341292
Merged-In: Iff36d5a10e6c8ee8978a5842af8f19efc10c0a91
2 files changed