nspire: reverse accidental merge with otg branch