Revert "Removed for now -nw-"

This reverts commit 26b43db8976f8de7e21ae8d4bc8dbf8eaab93849.