Get rid of ill-advised router helper wrapping silliness.