Restore Marty's Stockpile changes
(Previous commit accidentally overrode them)