High: ais: Revert part of an accidental commit
Mercurial revision: ff013f6d39087ead095601fa06f8fa282fbcd1b1