Revert the revertion of multiline and clean it up for new directive.