We won't be looking at a techincal solution for bug 4887 right now. But we'll try to add some relevant documentation to inform people how to work around the issue.
Fixed in commit 28318.
Looks good.