Revert premature patch.