Revert normalize upgrade