saltstack/salt — pull request #13954 by basepi (2014-07-03 00:22:49+00:00)
Title: Revert "Add Adi's correct code block in fileclient.py back in, prevent s...

Reverts saltstack/salt#13951

@cro I thought the test failures might be false positives, but they stayed after merging. Reverting this for now, we can revisit it in the morning.