This reverts commit 14852e0259, reversing changes made to a95dccd464. This is to fix the broken build (failing tests) as per #8925 and #10007
14852e0259
a95dccd464