Underlying bug has been fixed, workaround no longer needed This reverts commit 5b0cbcf946. Change-Id: Ic9532b407d1291a7780a12a75aaa117ae4aa9fcb
5b0cbcf946