Revert "Comments on design doc"