Revert "Revert "Fix for ISF manifest DB change.""