Roll back to get config working