Merge "Remove spurious composer validate call to avoid hang"