How to keep Original Quantity units aligned with Container's Units

If a Container Quantity is measured in Each units, and its Size has a Quantity per Each defined, then the parent Receipt Lot's Original Quantity will be shown in the units of the Quantity per Each.  For example, a Container is received with a Size of 2 Each, and the Size's Quantity per Each is 3 g, then the Receipt Lot's Original Quantity will be 6 g.

This behavior is by design, but a customer wants the Receipt Lot's Original Quantity to be measured in the same units as the Size and the Container Quantity.  How can this be achieved?

Note that this situation is more complex if the Container is received via a Hub Task since this requires an Each Amount to be passed.