Reverting pull in order to release rc1. Will re-apply the merge when ready for 1.0.1.

Revert "Merge pull request #1159 from getlantern/1158"

This reverts commit 6adfce7f186dd1b97c4e9e6d58f7084eb67b1fad, reversing
changes made to b3e9a6b258bb0df43765c1c02599b703f15173e9.

Conflicts:
	src/test/java/org/lantern/endpoints/FriendEndpointTest.java