Removed protobuf hacks. Fixes #22

This should help with the issues experienced in #22.