This reverts commit 7af73c34. Doesn't look like the right approach for adding support for XEP-0156. Work on that will continue in a branch in the meantime.
Attach a file by drag & drop or click to upload
