WIP of bug 1076706