Revert "Merge pull request #15292 from zzak/backport_43f525031ad3f83a04f84e79bbe1de340bf937aa"

This reverts commit d40287d330ae1b70f26ded242399db3e20cfb0c7, reversing
changes made to 2922417b9aef1df192338c421ce821c02088db5b.

These tests are already there