Normalize values for now until core is patched.