Fix #4173

This reverts commit 7cc6cea2d421862726081a39e932dbceeefcc775
from PR #3968.

At the time this seemed logical, but turns out it breaks the
ability to create non-PRIMARY composite keys, so ...
2 files changed