Use package imports, now that Issue 10386 has been fixed.