This reverts commits30084d7476and5b8c175804. The second commit was landed without proper review: not by fault of the submitter, but because I mistakenly thought this was modifying something else entirely that is unsupported. The first commit must also be reverted because it is a breaking change without the second commit. This corresponds to PRs #183223 and #188660, see those for more details.