Revert the baseModel case changes