Bug 922759 - More conventional import statements