Fix bad merge
Fix bad merge

Queue is already imported lower down (in a way that is safe for both
Python2 and Python3).

Change-Id: I170c8df711895a590db8872c97c7bc91d4534acd

haijieg/SFrame,haijieg/SFrame,hoytak/SFrame,dato-code/SFrame,haijieg/SFrame,hoytak/SFrame,dato-code/SFrame,dato-code/SFrame,haijieg/SFrame,turi-code/SFrame,ylow/SFrame,hoytak/SFrame,TobyRoseman/SFrame,hoytak/SFrame,turi-code/SFrame,ylow/SFrame,turi-code/SFrame,TobyRoseman/SFrame,TobyRoseman/SFrame,dato-code/SFrame,ylow/SFrame,hoytak/SFrame,turi-code/SFrame,hoytak/SFrame,TobyRoseman/SFrame,turi-code/SFrame,hoytak/SFrame,ylow/SFrame,dato-code/SFrame,TobyRoseman/SFrame,haijieg/SFrame,turi-code/SFrame,ylow/SFrame,TobyRoseman/SFrame,haijieg/SFrame,ylow/SFrame,ylow/SFrame,dato-code/SFrame,TobyRoseman/SFrame,haijieg/SFrame,dato-code/SFrame,dato-code/SFrame,ylow/SFrame,haijieg/SFrame,hoytak/SFrame,TobyRoseman/SFrame,turi-code/SFrame,turi-code/SFrame