Reverting a bit of code to make Desktop build available for the time being.