Comment 14 for bug 1729345

Removing 2.1 milestone (for now). If there are any volunteers to look into this for 2.1, please assign yourself and put the 2.1 milestone back. I suspect fixing this may require some risky changes that we wouldn't want to make for 2.1 at this point anyway.