merge-upstream: try to fix building (would it even work?)

merge-upstream: try to fix building (would it even work?) #832