Revert "Merge pull request #15 from rburakov/Andrew"

This reverts commit 58cb521d5eedaa6ca29f460f6f20190bb55ec4f8, reversing
changes made to edac2ece27594c7fad2a449b43b48cc1206197a9.

qqqqqqqqqqqqqqqqqqq