Make the merged unhooking code work again.