This reverts commit da79ccca1d34f427952cce4555e598a700adb8de. This optimized the unsuccessful case at the expense of the successful one. Backport of 293fd5da5b8c7b79bd34ef793ab45c1bb8ac69ea from master
This reverts commit da79ccca1d34f427952cce4555e598a700adb8de. This optimized the unsuccessful case at the expense of the successful one. Backport of 293fd5da5b8c7b79bd34ef793ab45c1bb8ac69ea from master