SBT: don't perform excessive third import
(cherry picked from commit dd63eb3)
SBT: misc
(cherry picked from commit 9eb9620)