Revert "nao 1"

This reverts commit 0459f33aa5783abee69216fda8df436936169d36.
Revert "nao"

This reverts commit 36412b305c9a7818a0b77433afad26c82b7faf6a, reversing
changes made to 4a37ad769cb89332cc45cfcfeda08e87046ae954.
agora sim