Fixes #2586 - Revert "Refs #2002 - Fog quick hack"

This reverts commit d37be454fa99c808acf7a89507ee6fd714f139de.
The original commit is not needed becase fog was upgraded.