Can we safely lose this comment now?