Without a follow-up revert these tests will fail. Co-authored-by: Sergei Zimmerman <sergei@zimmerman.foo> Co-authored-by: piegames <git@piegames.de> (cherry picked from commit 0c0a41a81a)
0c0a41a81a
