Rollback of last change which caused many issues