Revert "New changes"

This reverts commit 7699e728286f5ff77b23997dc1e1716e61213f77.