This reverts commit f9de3f6990. In doing so, this rescues the naomiwu design which was removed on purpose from one branch, but then that removal commit accidentally got merged in the branch where it was being kept.
f9de3f6990