Fix FELIX-3465 patch which was too aggressive in short circuiting package space calculation as witnessed by the regression reported by FELIX-3521.