Oops.  Restore boilerplate for common & spire.