Revert "Couple of bug fixes to file browswer"

This reverts commit 3f53add7e558173223f6ffdf6277c18dcae57302.
Revert "MOBILE-1507 - 1509 implementation"

This reverts commit a46eda3b9c82d0c265afe6fc7436675df21de9e3.