Revert "Merge branch 'humble-bucket' into production"

Undo the changes to command detection in bucket and keep commands
to the bucket module from failing.