Apply changes from Atmosphere/react-protocol#2