Revert "Merge branch 'projects' into 'master'"

This reverts commit 2b493695, reversing
changes made to b5c12f74.

This reverts !1487 MR because it cause bugs on mobile devices 


cc @skyruler 

See merge request !1509