Revert "Failed attempt at revising sample creation method"

This reverts commit 59e703e3705c6210406b24ce94bec794c11003c6.