Revert "Merge pull request #16 from FelixZhang/bnc#877369-1"

This reverts commit 3798eb07a56734a1985e343ba645d87b524ef3f1, reversing
changes made to af6b52af2064b934ef70a5edca181b2139842ee7.

The revert is due to build errors with update_desktop_file
Merge pull request #17 from FelixZhang/bnc#877369-2

Revert "Merge pull request #16 from FelixZhang/bnc#877369-1"