Gah, so it now turns out that something I spent about 4 weeks worrying about was NEVER a problem in the first fucking place. Fuck.