Merge pull request #1803 from adityamandaleeka/fix_4cf34fe
authorAditya Mandaleeka <adityamandaleeka@users.noreply.github.com>
Tue, 20 Oct 2015 06:23:43 +0000 (23:23 -0700)
committerAditya Mandaleeka <adityamandaleeka@users.noreply.github.com>
Tue, 20 Oct 2015 06:23:43 +0000 (23:23 -0700)
Revert some changed files from an incorrectly merged commit


Trivial merge