Update to r372 (untested)