Revert "bug fixes for tablets"

This reverts commit 4a8860952554cb4d4caea79f43262e0ce63e7728.