...instead of hardwiring the particular variant;
this one is switchable down the road at least.

The commit is a no-op otherwise.