Merge "Logically revert previous attempts on Bug 139806621"