Use my branch for chef-solo compatibility