Revert "Cleaned up nanmad -> mad issues"

This reverts commit fe10bc62af58af66ce4dd185fee8add7246c6852.
Cleaned up the nanmad -> mad consequences