Putting fix for protobuf header issue on OS X back in.