Remove unneeded #ifdefs.

Change-Id: I696133c42a142a8c596703fc8ce0250b58993d99
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>