Revert r397 to undo accidental commit of later in-progress work. Review URL: http://codereview.chromium.org/42603
Revert r397 to undo accidental commit of later in-progress work.
Review URL: http://codereview.chromium.org/42603

csulmone/gyp,csulmone/gyp,csulmone/gyp,csulmone/gyp