Revert back wrong change in 0002566728556fd8bc7054c36e94d73afdfd9159