Revert "Merges with master."

This reverts commit 8f55e4445c2beb252f8cae9bb03681fe787b9c96, reversing
changes made to ad6cfaf5c5ce88ef0ec23eda8abb76cb995e2040.
Reverts all commits from Mar 28.
Merge pull request #6 from rliebz/revert-changes

Revert changes