Revert "Revert "Was not using it for now""

This reverts commit f8ecfa088424d04fa25176f52a5bdc409503b107.