Comment 6 for bug 1434187

@asalkeld: Thanks, I'm planning to do some testing on this, just added heat so we'd follow up on why the revert is needed, I'll assign it to myself (although I probably can't work on this until next week, so feel free if anyone has time to investigate before then)