This is not being merged as we have started using React hooks, so a different approach is needed.