This reverts commit 9d56b419 as Framework's previous behavior has been restored. See gh-35739
9d56b419