Possible solution to 0.8.0 breaking on large commits