A bit confused about transport of glucose in the kidney

My understanding of glucose transport in general is the following:

1) ATP is used to setup a concentration gradient for sodium (from a low concentration of sodium to a high concentration of sodium)
2) Glucose and sodium travel together through a transport protein (from a high concentration of sodium to a low concentration of sodium)

Now, in the kidney we have several things going on:
A) Sodium is pumped out of the nephron by active transport
B) Water travels out of the nephron by Osmosis.

Now, no sodium is secreted from the blood into the nephron (hence no concentration gradient that would benefit the transport of glucose-sodium is set up using ATP like in 1) )

However the removal of water would make the sodium more concentrated. Is it water being removed what sets up the sodium concentration gradient for the glucose/sodium transport in the nephrons - and if this is the case, I don't see how ATP was used to do it so shouldn't it be described as facilitated diffusion and not secondary active transport?