Fix change that went in by mistake

I'm testing things locally without those flags because they are broken
in my test environment. The problem was reported to Kenneth. Sorry for
the noise.
Merge pull request #700 from cmarcelo/fix-wrong-change

Fix change that went in by mistake