Revert "Not compile that for now"

This reverts commit 247c96a6fec522029691debf1d5732b33ca068f2.