Revert "Merge pull request #1 from samplesampler/master"

This reverts commit e722257c10fb3c406f22beb783cf9ecad3c9e261, reversing
changes made to ec1bf693e429670670ceb926e179cf1b2a01ea90.