Fix shell provisioning (broken with merges/rebases)