This reverts commit 207d4be4 due to returning incorrect results. Regression test case posted in D96074.