Revert r94260 until findDbgDeclare() is made more efficient