diff --git a/packages/grafana-data/src/types/index.ts b/packages/grafana-data/src/types/index.ts
index 66af316e931..6fe2d439d2c 100644
--- a/packages/grafana-data/src/types/index.ts
+++ b/packages/grafana-data/src/types/index.ts
@@ -24,6 +24,7 @@ export * from './fieldColor';
 export * from './theme';
 export * from './orgs';
 export * from './flot';
+export * from './OptionsUIRegistryBuilder';
 
 import * as AppEvents from './appEvents';
 import { AppEvent } from './appEvents';
diff --git a/packages/grafana-data/src/utils/index.ts b/packages/grafana-data/src/utils/index.ts
index 038bf50635b..95779325189 100644
--- a/packages/grafana-data/src/utils/index.ts
+++ b/packages/grafana-data/src/utils/index.ts
@@ -8,6 +8,7 @@ export * from './labels';
 export * from './object';
 export * from './namedColorsPalette';
 export * from './series';
+export * from './OptionsUIBuilders';
 
 export { getMappedValue } from './valueMappings';
 export { getFlotPairs, getFlotPairsConstant } from './flotPairs';
diff --git a/public/app/plugins/panel/stat/types.ts b/public/app/plugins/panel/stat/types.ts
index c2efe8e5b2e..2f8f54742b2 100644
--- a/public/app/plugins/panel/stat/types.ts
+++ b/public/app/plugins/panel/stat/types.ts
@@ -1,6 +1,6 @@
 import { SingleStatBaseOptions, BigValueColorMode, BigValueGraphMode, BigValueJustifyMode } from '@grafana/ui';
 import { ReducerID, SelectableValue, standardEditorsRegistry } from '@grafana/data';
-import { PanelOptionsEditorBuilder } from '@grafana/data/src/utils/OptionsUIBuilders';
+import { PanelOptionsEditorBuilder } from '@grafana/data';
 
 // Structure copied from angular
 export interface StatPanelOptions extends SingleStatBaseOptions {