Revert "We do not need this"

This reverts commit 765cdad8ba3ab4372706146cac98a38adf8cd347.