[PATCH 0/7] Revert some refactoring patches