This reverts commit b659d7c3.

That commit appears to have broken the build on Linux. Reverting it
fixes it.

Change-Id: I70d62c04e9fb284ed2c360c0976d0cbeafc2ddc2