Way better fix for the squid file transition.  Does not require
a manual restart anymore.

(cherry picked from commit 101fc844)