Fix import order.  I've been stuck in a conflict-loop between the internal repository and the public one for a while, with each integration reversing the import order of the other; hopefully this'll bring them all in sync.