@jwhonce don't think we want this change :)