Revert 6a17711..e66bde5

This rolls back to commit 6a17711c5e074d5a27959266b6c67ae3e56c6ce6.
Revert 1ba9285..b940053

This rolls back to commit 1ba9285e059f8f34c843b4ad5ac1ff24d2849a2b.
=help me