This reverts r206828 until David has time to figure out that is going on.