Merge "Get rid of using ProtocolHandlerFactory, part 2"