Remove TODO, keep current behavior, as it is probably desirable