Try to fix #1785 without breaking pdata

3 jobs for pdata-1785 in 13 minutes and 26 seconds (queued for 4 seconds)
Status Job ID Name Coverage
  Build
passed #18853
build_bionic

00:04:59

passed #18852
build_buster

00:03:54

passed #18851
build_stretch

00:04:33