This required refactoring to move REINITIALIZE-SOURCE-REGISTRY-AND-RESTART to correct location. This shoudl also fix bug13353423, but we still need a better test.