Workaround for 4.8 - Bernhard Rosenkränzer
Signed-off-by: PipelinerArd <kristoferard@gmail.com>