Revert "DISGUSTING HACK to keep mediaserver from aborting when a picture is taken on S4"

This reverts commit 5f9aa1e7c9a6d74c8906935de26c679a3a235afc.