@opdenkamp comments?

(Does it makes sense to aim to get rid of the ifdef?)