Patch at #5 fails for 8.x-1.0-alpha9