Merge "Revert "Check if we require barrier if we did not resolve classes""