revert some slipped through patches
2 files changed