This reverts commit c0edbbb5. Reason for revert: broke dev test (com.roidapp.photogrid) Fixes: 144403961 Change-Id: I71ef435cfbdab46d2e57f2ed68af3eff04958a99