Revert bug-fix-undoings from acme patches.
2 files changed