Revert "Manually merging pull request #131."

This reverts commit 3b728acbd2542cafec32a4fb982cf321386b8bd9.

Signed-off-by: Dmitriy Kalinin <dmitriy@pivotallabs.com>