Revert the changes that went too far and broke things.
Eliminate the union that is no longer needed.