This reverts commit 4c06ecc2 because it caused build failures when building folks for the first time without a system-installed copy of the development headers.