I am not sure rearranging the ordering of the imports is that necessary here.  It makes the diff a bit difficult to read.