Revert backported code.