I can confirm the patch attached fixes #654201 too. It fixes the build error both on amd64 and armhf (I expect on i586 a rebuild would fail too but I have not tested it) Would be nice to see this going into a release since it hits several architectures. Thanks!