Revert fix-pinning merge to resolve crashes

Reverted a previous merge (PR #6543) that was causing crashes. The fix-pinning changes have been rolled back to restore stability.

Source: original entry ↗