Fixes FL-1065 with patch from Arch Linux. Patchset updated to version 4.