Revert PathMetadataFactory change