Can we vote on it as is? It fixes the problem, we can make it "pretty" later. Of course, if someone has a better solution right now...
We aren't ready to do 2.2.1 just yet, so there's no need to particularly rush this fix. Let's confirm that the cases are fixed and that our approach is correct and not a band-aid. -- justin
