Revert of Revert of Revert of moar ws

Revert of Revert of Revert of moar ws (patchset #1 id:1 of https://codereview.chromium.org/520023003/)

Reason for revert:
spring break forever

Original issue's description:
> Revert of Revert of moar ws (patchset #1 id:1 of https://codereview.chromium.org/518333002/)
> 
> Reason for revert:
> nah
> 
> Original issue's description:
> > Revert of moar ws (patchset #1 id:1 of https://codereview.chromium.org/518233004/)
> > 
> > Reason for revert:
> > i like the old file better
> > 
> > Original issue's description:
> > > moar ws
> > > 
> > > BUG=skia:
> > > 
> > > Committed: https://skia.googlesource.com/skia/+/7a353e9
> > 
> > TBR=mtklein@chromium.org
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=skia:
> > 
> > Committed: https://skia.googlesource.com/skia/+/4ee3e529e2756275a978ae5e4763955a703191f2
> 
> TBR=mtklein@chromium.org
> NOTREECHECKS=true
> NOTRY=true
> BUG=skia:
> 
> Committed: https://skia.googlesource.com/skia/+/5355536c790831f05cdd37a0ac84206ad1c3dc56

TBR=mtklein@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Committed: https://skia.googlesource.com/skia/+/2fe2ce41e3e5647c7aead4d76d75f5500f573fde

[mtklein, 2014-08-30 01:39:56]

Created Revert of Revert of Revert of moar ws

[commit-bot: I haz the power, 2014-08-30 01:40:20]

CQ is trying da patch. Follow status at
 https://skia-tree-status.appspot.com/cq/mtklein@google.com/519303002/1

[commit-bot: I haz the power, 2014-08-30 01:40:27]

Committed patchset #1 (id:1) as 2fe2ce41e3e5647c7aead4d76d75f5500f573fde

[mtklein, 2014-08-30 14:54:25]

A revert of this CL (patchset #1 id:1) has been created in
https://codereview.chromium.org/523413002/ by mtklein@google.com.

The reason for reverting is: ws.