Revert "re #9604 fix to allow single bin workspaces in CreateSampleWorkspaces"

This reverts commit 6ace8fecb98a5b0a3edd434745efb9f0fd313b33.