Reset bucket properties

This supersedes #23, being a clean application on the post-refactor master.