Revert "Merge pull request #41 from junkumar/shark-0.9"

This reverts commit 9363f2a46147e553c977bb03a607edbcc3ef2d90, reversing
changes made to ee062d6fb65b35646c86b430b87338b1edab4bd8.