Revert "Revert "Made it compile.""

This reverts commit dbfb892d90b3598b94ce8b92f10eec92317540f1.