WIP of Bug 1111466