Bring back the old munge function
Remove tests of properties the old munge fn doesn't have