Due to #3600, for 5.10.2 we have decided to revert the changes to our field search algorithm introduced in conjunction with #3532.

However, we will address the issue originally raised in #3532 when we resolve #3553 in 5.11.