unapply patch

Cleanup upstream source from debian patch.