Revert r11689 and r11690 (uninitalized warning fix) as its theoretically