I'm running into the same situation where I'm trying to upgrade a century-old installation but it appears that the AHJ would rather that I just leave it as a firetrap since I won't tear out structure that has served perfectly since the late 1800's...but doesn't meet the strict letter of this years' Code.
