This isn't the right approach for addressing this cross-build issue. This reverts commit 820401bf17.
820401bf17