Revert "Pull some new commits from google tree"

This reverts commit 86100093f40b96f21dcedee8f300cea7067c1836.