Change https://git.eclipse.org/r/#/c/147013/ caused compilation
warnings after refactoring of questionable code. Rollback refactoring
to avoid compilation warnings.

Change-Id: I0351bd44ded32d5815c60ed4cf8f210ddc539284
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>