Revert 7228b17..fccbf67

This rolls back to commit 7228b1713959a4861ef573eb15a080d35c1bccd0.
nn