Use Xander's common.h code instead of homegrown saas_common.h