'Until which' as relative clause

These dangerous goods, until which are delivered to the place of storage, must be packed inside shock-absorbing materials.

Does this sound wrong or hard to be comprehended? If it does, what's the better way to rewrite while keeping the order?

Solution 1:

Original:

These dangerous goods, until which are delivered to the place of storage, must be packed inside shock-absorbing materials. (bad grammar)

You can't say "until which" because this sentence structure doesn't need a relative pronoun.

This sentence should be rewritten in one of these ways:

1. UNTIL these dangerous goods are delivered to the place of storage, THEY must be packed....

2. These dangerous goods must be packed... UNTIL THEY are delivered to....

3. These dangerous goods must be packed....UNTIL SUCH TIME as THEY are delivered....