old version with no changes for freedesktop