Revert "Removed avatar_uploader"

This reverts commit 9acafdd4bea0b556163abf8cda5b6d676f026a21.
Temporary return avatar_uploader