Revert "Remove unused baseline and flavour params"

This reverts commit 8c20fc195987512f25bd46fe2eb4516e0059807c.