Solitar: Retro Picks: Revert last hotfix that was causing other issues

Reverted the previous hotfix while investigating a newly introduced issue.