Apply upstream patch 295.