Trivial conversion to the new pickup/drop system