Removed unnecessary dependency on Addressable.