After restoring the associated commits the tests can be enabled again. This reverts commit 711524d961233cd017ee0fd17e4b87013720f1c8. This reverts commit c4585b938a04dfb157d7a10fa958be13415145be. PR: 263767
After restoring the associated commits the tests can be enabled again. This reverts commit 711524d961233cd017ee0fd17e4b87013720f1c8. This reverts commit c4585b938a04dfb157d7a10fa958be13415145be. PR: 263767