Add TODO to fix fragile SQL
fix import error introduced during minor cleanup
(cherry picked from commit b4e7320)