Instead of allowing the first task to fail, then using the fallback - use block/rescue to achieve the same, but totally skip the second task if the first succeeds. Change-Id: Ic90ffdc7dabc1477050f66a23f8bd7cc85682b07