Update to today's snapshot and remove non-applicable patch.