Applied upstream patch to fix symbol versions