Restore lost changes

Due to some unspeakable git munging, we lost some changes from the original docx_conversion. This is an approximation of those lost changes.