Rollback r1123 which landed on the wrong branch, again.

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