Backward compat removal 1.7.1

I'm opening this PR right now since it's ready for review.

It should land at the very end of the release when we're sure we're ready to migrate the internal build to git.