Revert "TODO: Why is this gone?"

This reverts commit 43af1c1b368081dfca8c3d510a4cc91a2e122705.