Fix usage of deferred pre_execute_hook (OMS-362)