revert RequestHandlerComponent for now