Revert "Update to Bleeding-Edge"

This reverts commit 17bf652115bdd06a10b76a2943475f3f6801a6a0.