reverted recent changes, all configurations wold be done on server side