Revert "Revert "samcommitted""

This reverts commit 94109143d711735e489dc73ab238c7f3e0afd4f3.