Revert "patch2"

This reverts commit e9369e87bea9536f32172c457f50e05af7fca0e5.
Revert "patch1"

This reverts commit 742254b947f9c6af9986b51b1513277fd6869ed3.