I'm going to land this as-is but I filed bug 941970 for a better solution here.