More fiddling with package order in requirements.txt