Bug 1098017

I usually try to do this in a different commit or outside of the pull request