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