This reverts commit da79ccca1d. This optimized the unsuccessful case at the expense of the successful one.
da79ccca1d