Skip rethrow on client

Will merge if no complaints by 2013-04-23T16:00:00Z

This skips the rethrow logic on the client, which fixes the problem of it attempting to require `fs` and then read the file.

Supersedes #756