reversing munge in preparation for refactoring