Revert e8e66d8 because I think it causes #9