Revert #1739

#1739 introduces a too big performance hit and large printouts. Killing this before it kills the next IB as well.