Comment From: sjohnr

Related gh-12790

Comment From: sjohnr

Reverted (temporarily) via d76e15d708e8667cd56e6db78cdbab4e96df4afe

Depends on gh-13408

Comment From: sjohnr

Reverted again via 2a80048340d87ad87c0941dd14447518b589a328.