This reverts commitab7297f3c1. It was mistakenly applied but the error described doesn't apply on the LTS branch. Signed-off-by: Thomas Perale <thomas.perale@mind.be> (cherry picked from commite69822b2dc) Signed-off-by: Thomas Perale <thomas.perale@mind.be>