Remove hijack from api when not necessary Upstream-commit: bebbbf914b241448c6304c915c708f7cbc582c06 Component: engine