Revert "Tests passed when given patch was applied."

This reverts commit 762a65318b03e993a85678fbe6162caaf5a2fb19.

Fixed #18261