8dcf879c14
This reverts commit 66999f0a19.
Reason for revert: no longer an issue
Change-Id: I55a045846825e6b62fac4a9ed59380620870e953