[tlarkworthy]

https://github.com/protocolbuffers/protobuf/issues/1896

Ok some of the things I said couldn't be done, can be done, but it's situational