Rollback a merge in av3-basic.
Fix an old, long outstanding bug in av3-basic.