Back out changes from #6267 / 'api_core-1.6.0a1' release. (#6328)

We will bring them back in when we have an OK to make a non-alpha
'api_core-1.6.0' release.

Toward #6326.
5 files changed