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