Unrevert some of the latest changes that were undone #608

Closed developedby closed 3 weeks ago