Test revert of some recent NW changes

This reverts commit 049b8edbfaa98afe5b1c510d470b391499918c52.