Reverted temporary fix for #295 b/c #295 is fixed