Revert: Improve linkage between proprietary libs