Temporarily remove without_all conditions