Bump this, since it seems inevitable at this point.