Update repo based on 3.1.2 egg. Simplified our change, use existing normalizer instead of overriding an existing one
README