Replaces bad validation implementation with a better one