This conversion is in preparation for integration of the
ucps/dkus/dnd-inline-images branch.

Testing done:
- Ran unit tests.
- Used this in conjunction with the changes in the inline-images branch.

Reviewed at https://reviews.reviewboard.org/r/8096/

fsdfosdfsojfsdj fsd jfsdfjlsdfjlksdflskjdf sldkjfsfksj