Verified through r2386.  #139