Reset to match googlecode source