Undid cluster specific changes as they wouldn't really work.