Revert "Merge pull request #339 from Cocoanetics/atomurlfix"

This reverts commit 049e3a8cf83de0760982f66b0bf8d09e9c75b105, reversing
changes made to 81cf405bafa71f9519ecd9b2c94b1e9786684c8a.
Revert "Merge pull request #327 from camjknight/master"

This reverts commit c16d2674d2388f43334beee2eaf0b1edbdcb5303, reversing
changes made to 040c578924f8161c1212fa42d52ece7b9e8bf4f7.