Remove stack search
Merge pull request #1712 from darkwing/911-stack

Remove stack search