Revert "TODO: off on server"

This reverts commit a18e7e223693d45ef9a35ed88bd29e4f163e2d86.