e25c86e947
This reverts commits30bd216500,9a587e8c8c,38e6008aa2,5af1c7756candc8d6f20c3b. It reverts pr #2 from my branch