Revert "Revert new meter types (postponed until after 3.3 release)"