Revert

This commit reverts commits:
- 33ea991a25d3d2ecfb8f8d36902ef1b187a269a9
- d108ab1bf65a6b9191e354930fa7b4ffdef7a55e
- c04197ce590045a8223193fd31e6ae0d46236336