Removed forced context-inject of handler.api.