Revert "Merge branch 'deprecate-es-7' into 'master'"

This reverts merge request !215862 (merged)

Per our handbook, we need approval for this deprecation first.