am e7147462: Fix debugger performance regression

* commit 'e71474621b968a9bc649d067155d31213f5764a9':
  Fix debugger performance regression