This solves the missing dependencies problem after backporting
21f651c6 in a somewhat crude way, though 16.1.20 is EOL it won't
matter much.

Suggested by: @devste