We're getting good results from #3093, so there's no reason to keep maintaining this code.

Ref #1848 #2068