I HATE this, but it's now just plain broken, and no one's going to fix it (or accept a fix for it).