The patch didn't get proper attribution. Will recommit. This reverts commit 4135abca897d1b945193f767cbf42a200b55bbdc.