This reverts commit 657d20dc. A correctness problem was reported against the review and the fix warrants re-review.