-- Revert file removal in svn r64512, so that upgrading a existing DB and a clean install generate same output
