Fix up imports broken in 1.9.1