Merge "Remove temporary openSUSE-42.2 workaround"