Comment 2 for bug 1535349

Here's a first go of the patch. I need to clean it up and show attribution, and what-not. I just wanted to share that there is progress. I have also confirmed that it resolves the issue mentioned in this bug as well as successfully completing the available testcases.