Revert tweak to thrift schema