This seems a little dangerous. The old code doesn't work for all situations, so we're just commenting it all out and setting to zero?