I missed a test failure in the DebugInfo directory. This reverts commit 2c15b9d9. This reverts commit fb435e1c.