This simplifies the code in several lines.
(cherry picked from commit de742db2)
Signed-off-by: David Fuhrmann <david.fuhrmann@googlemail.com>