Revert "dropStack now returns more null stacks"

This reverts commit 7b807ce60b3eab03ea5f3b86e188e83229ee5114.