Bug 892520 - Ensure proper upgrade path