Note: This change requires two in-place restarts when you are upgrading in-place from an old version. Fixes #611