Bug#85923 Remove external deps, move to native