Revert the greeter, fix builds