rever 936735f and 6268174 commits