Moves pickup truck to avoid merge conflict

Because otherwise the mirror PR might well get mixed in with the shift
from the pickup.