Revert "Merge branch 'user-upload-images'"

This reverts commit 59c5fd206ba57555924ccbcbf9a85b46f65ed7cd, reversing
changes made to f5760b0519812a5b11260da7b2b63972167e4570.
Revert ceebd84..38c29bd

This rolls back to commit ceebd84785037e9a8c5a6f1b8f54a3a80bdf213b.