Revert "Merge pull request #1 from klinec/ticket-1"

This reverts commit d6e2adb6bbdf2b8403707b5d653a83616899c519, reversing
changes made to 6bf7fd49c34f199c560fdd4dafe9cbd0c8fbd5ca.