i9500: revert any changes that could create problems with storage