This reverts commit 0fff8798. This has created issues both for phone and desktop users. Needs more investigation.