Reverted most of 97b4bcb45829a08ba7e7d8ab265ef56e34352eed