Reverted a little part of pull 293, waiting for a proper printf fix