Revert "Issue #3520765 by svendecabooter: Improve performance by preventing unnecessary scanning of procedural hooks" This reverts commit 44616dff.
