This reverts commit 0e7244d61e01ab4f2e3532d274115903eae7a3d7
with a few improvements.
We now need to patch the shipped version of gyp in tools/gyp.