Fix ordering of format controls to preserve behavior of pip

Fix ordering of format controls to preserve behavior of pip #3884