Comment out breaking interface changes.  This will be put in for the next release.