Comment 2 for bug 975011

This is the wanted design iirc.