Revert "Resolve #1 second attempt"

This reverts commit bdace802398c0279404a1106b92ded84587965d9.
update from desktop-branch

Update from desktop-branch
resolve conflict

resolve conflict