Instead of messing around with the section's id, leave it alone and check for a file id whenever looking up the current id. [SVN r85267]
[SVN r84252]