Comment 3 for bug 744104

This change brings us a lot closer to the original design, and is also a major refinement on one of the key new features that we will be showcasing in Natty. If this change is not a large instability risk it should definitely gain a ffe. Ping me on IRC if this needs to be discussed further, thx