Late night changes are dangerous.

@rev amcculloch@
Merging origin/goliver/master-pending-reinit-fix-2 into master