Re-remove deprecated API.
Merge pull request #11146 from kennyj/re-remove-deprecated-api

Re-remove deprecated API.