Change the way file is stored
We don't need this option anymore
Land #2176, @wchen-r7's fix for [TestRM #8272]