Reverted back to old logic for execute_hook_by_name()