Rollback r1119 which landed on the wrong bronch.

Review URL: https://codereview.appspot.com/11565044

git-svn-id: http://blockly.googlecode.com/svn/trunk@1122 c400ca83-b69d-9dd7-9705-49c6b8615e23