FIX: remove hardcoding from middleware stack so we can control it