Horrible ImportError is fixed. At least it should.