Revert submission

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

Change-Id: Ie75fe87dd671ebe00add8c858da47dff793077a4
Merged-In: I526410612fe2f733ae41efe7ed1a20ab6d620458
7 files changed