revert assertions that there can only be a baseline or a configuration - there can be both