Revert "Resolve "Needed extended functionality: adding classes and target when isLinkSafeFn is false."" This reverts commit c265d712