Reverted 1ca0aab1e, which fixes issue #165