Previous middleware integration is borken