This commit was SVN r22349.
Modify the startup logic to allow for this use-case. This commit was SVN r22310.