This TODO is a result of the work done in #1598: 