Personal namespace stripping code got lost during rewrite