Import commit 8243bb6e from upstream.
The patch added in 1.5.0-1 had rendered the package unusable. Closes: #958064.
@zigo @onovy
