Fix bootup crash -- revert regression