remove obsolete workarounds
Merge pull request #1300 from wmtan/RemoveObsoleteWorkarounds

remove obsolete workarounds