This reverts commit 8b3532c562. The change mentioned inline has been incoporated upstream with [1]. I don't think we've managed to replicate the corrupt wheel situation since. [1] 0dbab23df9 Change-Id: I58fa0a53939207427f286584e91e1c59d4863992
8b3532c562
0dbab23df9