Bug 1093874 2nd attempt

New pull request created for Bug 1093874, reverting dummy filechange commit
actually we discussed this same issue with bebe and davehunt, and we came to the conclusion that in this particular case, it's simpler to have it copied within the test