Used our customized Fog

This is a temporary change until Fog release our pull requests