Merge topic 'context-Update-Crash-macOS-10.5'

363b3726 Removing unnecessary code that seems to be the root of macOS 10.15 crash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ken Martin <ken.martin@kitware.com>
Acked-by: David Gobbi <david.gobbi@gmail.com>
Merge-request: !6653