Signed-off-by: Peter van Dijk <peter.van.dijk@powerdns.com> (cherry picked from commit b624721435)
b624721435