Fix #1618: Upgrade from 1.6.4 fails (after JUpgrade)