Reverting 225045 and 225043 and XFAIL multiline.ll on hexagon