Freedesktop is back --- original version as submodule