5073459296
This made the code more complicated without reproducing the problem. This reverts commit 77632b7554000f2e832a0e9fded1a3894b2502c3.