Revert [3c0b0bbda6]. If this really is a problem, it needs to get fixed by other means than covering behind void pointers.
merge trunk