even more mobile fixes
Revert "even more mobile fixes"

This reverts commit 3d0e8d8f08e74d07ffb208c6f66a9dd4dfc6841e.