Revert "Remote again"

This reverts commit ac7468463c54ed3a1250c294397017a6077edbea.