Roll back f19bc7ea70747934a7765411234950bc6c023a81

Commit f19bc7ea70747934a7765411234950bc6c023a81 is busted in multiple
ways.  It contained a malformed patch and breaks remediation.  Roll it
back.