Revert "Fix DSO linking issue"