Remove obsolete workaround
Merge pull request #4515 from wmtan/RemoveObsoleteWorkaround

Remove obsolete workaround