a5b673d542
This reverts commit d3fa6b428a.
Don't change this, since 4.3.1 won't build on Stretch but we still want
to support it.