Revert "Nasty, hacky, leaky switch from overriding principals to expanding them.  WIP."

This reverts commit 0e069d6f7a87504f500769f31d83ba1522de7c4a.