The TODO note is no longer relevant after this change and should be removed.