Reverted to "import X" style.