Merge "Remove skipping of the Fabric config code"