This reverts commit fc232422, reversing changes made to 754816b8. We don't have many binaries yet. Comment on the original merge commit.