wcnss: revert to old form