Undo the fix for #108