This reverts commit c3492a1a. I think this is the wrong strategy and wrong place to do this transform anyway. Also reverts follow up commit 7d593d0d.