Revert "Thanks @vanstee fixed the missing avatar issue"

This reverts commit 59d9185849e339d5b58c02d7b63139c41e5eeede.