This reverts commit f8c7ced9. Reason for revert: broke dev test (com.roidapp.photogrid) Fixes: 144403961