Avatar URLs are wrong when using a CDN path and Object Storage

If using a CDN path, like on staging, for avatars, an avatar that is uploaded to object storage will have the CDN prepended to the url.

It seems this has to do with the avatar_path or avatar_url in the Project/User models and an interaction with the only_path: true parameter.