Reverting caviar package back to main