Revert an earlier commit that introduced a bug that caused initialization to crash