This reverts commit 8fcce5ac. I spoke too soon, the revert does not actually cause the startup crash to go away.