Revert "Latest changes"

This reverts commit 542aef641978c6b15d5978bb7433ebbd3c0796c5.