Go back to using single class imports, accidentally replaced by .* in the previous commit