This reverts commit 04848401d5.
However, we retain the test for #11463, which didn't actually
need the reverted commit.
Closes #11788.
This reverts commit 04848401d5.
However, we retain the test for #11463, which didn't actually
need the reverted commit.
Closes #11788.