revert serveMachines to serverHandler