bleh, silly upstreams