Revert "Temporary workaround for #777 while we investigate googlesource.com"

This reverts commit a003c45ebfe966383b2715e234e12e319cba140c.