Add back some interface stuff since removing it is unnecessary. Better
diff.