Revert "Merge branch 'master' of https://github.com/ColdPain/darwin"

This reverts commit fd8e7ca77138d2cad46624bd94df3be5bad120f0, reversing
changes made to 414d4424549795ee5e26113e7626e1e0c2608fd5.
Revert "Revert "Merge branch 'master' of https://github.com/ColdPain/darwin""

This reverts commit 3ae9c725006b337638e5b57ceee6a67504b34647.