Hopefully also fixes build for iOS by re-introducing checks for DESKTOP.

Also this commit partially reverts 52a8744a.

Change-Id: Ie94c771b72ba138bb0481b054285916618baf6eb