This is one...

Of those things that was a lot easier to fix a few years ago than it is now, and will be much harder to fix in a year or so than it is now.  Time is not our friend on this.  We have to fix it now.