Reverted r26952, using the blocks irg is ok ...