Revert: "Add ONDEMANDPLUS Governor - Thanks to Boy Petersen"