Bug 937103: Removed the condition placed by Bug 818287
Merge branch '937103' of github.com:s-dehaan/gaia into 937103