remove workarounds for resolved issue 13049 and 13050
Merge pull request #917 from MartinNowak/removeWorkarounds

remove workarounds for resolved issue 13049 and 13050