Fixing wrong import after refactory
(cherry picked from commit 11edc5d261fc50270c2a2f5b4de59e0ef8f364df)