Comment 2 for bug 1474874

Removing myself as an assignee for now because I haven't had a chance to work on it. I still plan to work on it, but I wanted to leave it available for somebody else in case they are able to get to it before I can.