Rolledback upstream 3cf067049211 because of backwards compat concerns
Merge pull request #10 from alex/undo-change

Rolledback upstream 3cf067049211 because of backwards compat concerns