944a6c937c
This reverts commit 97b3ae1a8766616675ebf2323a97d8adfd41bfdc. Reverted since 4bb6b751fbbb218e8a298db4aa008472a0aa8d31 reverts the commit that warranted this change. Change-Id: I56d0eb8ffba44a673ae357e9543dd18f6c03c54f