3902e359c2
This reverts commit 424c00985e87e835522c37a18a24145225c0f371. Reason for revert: The contents of the patch no longer match the patch name, so this change is going to be implemented in a new patch. Change-Id: I7b7c6d5e5d475c7900e0cef131eb6489104960ce