New code seems to have caused a few other issues, and the reason
for having changed it doesn't apply anymore (fixed elsewhere
already), so might as well restore this one :)

Fixes #146