Remove the short-circuit again. It's stupid.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>