This was a hack which is no longer necessary now since we introduce a
dedicated entry block for each procedure.

(cherry picked from commit 72af6e9e)