Uh.  Not merging because this was a fairly important change.