SSP-2026 - reverting accidently checked-in 'short circuiting' code