Revert "Update to r4375"

This reverts commit 43550266e4fd1793dc031e3d24cdd3057e3d449e.