+1 to this, and this is also what we discussed in IRC yesterday, I believe.