Revert Sample
Revert "Revert Sample"

This reverts commit 330e0ddb1ef81d9cc7211b203726db6150b04590.