Recommit r668, which got undone accidentally by r673. Review URL: http://codereview.appspot.com/4589043 git-svn-id: https://angleproject.googlecode.com/svn/trunk@683 736b8ea6-26fd-11df-bfd4-992fa37f6226